Drop GDK_MULTIHEAD_SAFE

We don't support multiple screens anymore, so there is no need
for marking API as multihead safe any longer.

diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml
index f61460c6d1993b10e51da5cf1fcd15442effa782..55d1115fdd24b2eb60d928726a67dc761d109640 100644 (file)
--- a/docs/reference/gtk/compiling.sgml
+++ b/docs/reference/gtk/compiling.sgml
@@ -90,13 +90,6 @@ GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
 GLib.
 </para>
 
-<para>
-If you want to make sure that your program doesn't use any functions which
-may be problematic in a multihead setting, you can define the preprocessor
-symbol GDK_MULTIHEAD_SAFE by using the command line option
-<literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
-</para>
-
 <para>
 Similarly, if you want to make sure that your program doesn't use any
 functions which may be problematic in a multidevice setting, you can

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index fd334579cdc36dc7fabe3674261d21ff26a23ed3..e84f54d90679452426804899afe9c817eebb30aa 100644 (file)
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -162,10 +162,6 @@ additional environment variables.
       <term>keybindings</term>
       <listitem><para>Keybindings</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>multihead</term>
-      <listitem><para>Working on multiple displays</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>modules</term>
       <listitem><para>Loading of modules</para></listitem>
@@ -395,10 +391,6 @@ nevertheless.
       <term>nograbs</term>
       <listitem><para>Turn off all pointer and keyboard grabs</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>multihead</term>
-      <listitem><para>Information related to multiple screens</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>xinerama</term>
       <listitem><para>Simulate a multi-monitor setup</para></listitem>

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 8968bbc3d7dbba8ed00a18094cdd4fea0c5cdd81..48286f701e107714ea169f844489a48a35aeb38f 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -219,10 +219,8 @@ GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_for_display   (GdkDisplay      *display,
                                          GdkCursorType    cursor_type);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new               (GdkCursorType    cursor_type);
-#endif
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_from_pixbuf   (GdkDisplay      *display,
                                          GdkPixbuf       *pixbuf,

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 04ff0aca828dcbe12f193fdb236d1b1c34c27f73..0cfde38cd4be3d81b03802f805be6be1b38f8060 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -479,11 +479,7 @@ gdk_event_put (const GdkEvent *event)
   if (event->any.window)
     display = gdk_window_get_display (event->any.window);
   else
-    {
-      GDK_NOTE (MULTIHEAD,
-               g_message ("Falling back to default display for gdk_event_put()"));
-      display = gdk_display_get_default ();
-    }
+    display = gdk_display_get_default ();
 
   gdk_display_put_event (display, event);
 }

diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index ae0b681112bb213f1feb5d01347540c7880f7e66..d681de7a887d899de1bb06bd30ace147056fb654 100644 (file)
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -1305,14 +1305,10 @@ void      gdk_set_show_events           (gboolean        show_events);
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_get_show_events          (void);
 
-#ifndef GDK_MULTIHEAD_SAFE
-
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_setting_get                (const gchar    *name,
                                          GValue         *value);
 
-#endif /* GDK_MULTIHEAD_SAFE */
-
 G_END_DECLS
 
 #endif /* __GDK_EVENTS_H__ */

diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 281b550edfd03caa92cec97f7e7ef83eac30e72c..9749467a907ead7375ce862aabf085b109dbce74 100644 (file)
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -80,10 +80,8 @@ struct _GdkKeymapKey
 GDK_AVAILABLE_IN_ALL
 GType gdk_keymap_get_type (void) G_GNUC_CONST;
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_default     (void);
-#endif
 GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
 

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 1e488ca4c5434b2c724de7f748839e3f90844cfc..c574f34471a446d4ed865a6b4b3b556fb8717d40 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -95,8 +95,6 @@ GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
                                       guint32       time_);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
-#ifndef GDK_MULTIHEAD_SAFE
-
 #ifndef GDK_MULTIDEVICE_SAFE
 GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void          gdk_pointer_ungrab     (guint32       time_);
@@ -122,8 +120,6 @@ void gdk_set_double_click_time (guint msec);
 GDK_AVAILABLE_IN_ALL
 void gdk_beep (void);
 
-#endif /* GDK_MULTIHEAD_SAFE */
-
 GDK_AVAILABLE_IN_ALL
 void gdk_flush (void);
 

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 348f8f33368ed7d5412161d05fcfa73d0f845137..af2abf404b972008fba96576830653f2213b237b 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -31,10 +31,8 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get            (void);
-#endif
 
 
 /* Get a clip region to draw only part of a layout or

diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index 6520624bfe7650838534402f9cf3ed48b5971839..396982508b95b15a63ad73a9f2953c19ffbdccad 100644 (file)
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -152,7 +152,6 @@ G_BEGIN_DECLS
 /* Selections
  */
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set (GdkWindow   *owner,
                                    GdkAtom       selection,
@@ -160,8 +159,6 @@ gboolean   gdk_selection_owner_set (GdkWindow        *owner,
                                    gboolean      send_event);
 GDK_AVAILABLE_IN_ALL
 GdkWindow* gdk_selection_owner_get (GdkAtom      selection);
-#endif/* GDK_MULTIHEAD_SAFE */
-
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set_for_display (GdkDisplay *display,
                                                GdkWindow  *owner,

diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index 189a8268d3e7f3bf3ff8d2e594b0841ec9d3d4dd..3d0f76e527f8b4205d46084164c5361a581264e4 100644 (file)
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -82,7 +82,6 @@ typedef enum
 GDK_AVAILABLE_IN_ALL
 GType         gdk_visual_get_type            (void) G_GNUC_CONST;
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_best_depth      (void);
 GDK_AVAILABLE_IN_ALL
@@ -108,7 +107,6 @@ void gdk_query_visual_types (GdkVisualType  **visual_types,
 
 GDK_AVAILABLE_IN_ALL
 GList* gdk_list_visuals (void);
-#endif
 
 GDK_AVAILABLE_IN_ALL
 GdkScreen    *gdk_visual_get_screen (GdkVisual *visual);

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c66c8ee20418599e0b6d423277f4d6e8b7c2dc73..70931ba858945674a2a046bd9df7756de3e73afc 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1243,9 +1243,6 @@ gdk_window_new (GdkWindow     *parent,
 
   if (!parent)
     {
-      GDK_NOTE (MULTIHEAD,
-               g_warning ("gdk_window_new(): no parent specified reverting to parent = default root window"));
-
       screen = gdk_screen_get_default ();
       parent = gdk_screen_get_root_window (screen);
     }
@@ -6034,12 +6031,7 @@ gdk_window_get_geometry (GdkWindow *window,
   GdkWindowImplClass *impl_class;
 
   if (!window)
-    {
-      GDK_NOTE (MULTIHEAD,
-               g_message ("gdk_window_get_geometry(): Window needs "
-                          "to be non-NULL to be multi head safe"));
-      window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
-    }
+    window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 00bf0984b49d24285f422c2dc80a63aebeaf2a25..12203c994de2b6078d0da87673989347d72a0c78 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -469,8 +469,6 @@ _gdk_x11_window_get_property (GdkWindow   *window,
     {
       GdkScreen *screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, g_message ("gdk_property_get(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return FALSE;
@@ -607,8 +605,6 @@ _gdk_x11_window_change_property (GdkWindow    *window,
       
       screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, g_message ("gdk_property_change(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return;
@@ -658,9 +654,6 @@ _gdk_x11_window_delete_property (GdkWindow *window,
     {
       GdkScreen *screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, 
-               g_message ("gdk_property_delete(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return;

diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index ac610e0bf63912e1b854a051f05e7ae53275a0eb..55d4fbaf46549e6dc4a1781f9975d4f0c36f8e93 100644 (file)
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -49,7 +49,6 @@ Atom                  gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *displa
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
                                                           Atom         xatom);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
 GDK_AVAILABLE_IN_ALL
@@ -58,7 +57,6 @@ GDK_AVAILABLE_IN_ALL
 Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_x11_get_xatom_name    (Atom         xatom);
-#endif
 
 G_END_DECLS
 

diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index cc707dd104693e72da02a37e03d626cec014a64a..6b29a7840f969d6adebfea459a0d46d6c9a61367 100644 (file)
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -61,10 +61,8 @@ int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gint     gdk_x11_get_default_screen       (void);
-#endif
 
 /**
  * GDK_SCREEN_XDISPLAY:

diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index 573e2ecce17f9f5000259a7f33d887eea1e1e4a7..0fa34bcf6c7b0feb6af92668e7161521397cabbb 100644 (file)
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -36,21 +36,17 @@
 
 G_BEGIN_DECLS
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 Window   gdk_x11_get_default_root_xwindow (void);
 GDK_AVAILABLE_IN_ALL
 Display *gdk_x11_get_default_xdisplay     (void);
-#endif
 
-#ifndef GDK_MULTIHEAD_SAFE
 /**
  * GDK_ROOT_WINDOW:
  *
  * Obtains the Xlib window id of the root window of the current screen.
  */
 #define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
-#endif
 
 /**
  * GDK_XID_TO_POINTER:
@@ -71,12 +67,10 @@ Display *gdk_x11_get_default_xdisplay     (void);
  */
 #define GDK_POINTER_TO_XID(pointer) GPOINTER_TO_UINT(pointer)
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_grab_server    (void);
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_ungrab_server  (void);
-#endif
 
 G_END_DECLS
 

diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index d65b2bd95fcbe020cd46ffde3e67765b4c19f0e3..e59a45093cc9108bc629b311b5059e1cf947d766 100644 (file)
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -186,10 +186,8 @@ GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
                                             GdkAtom       selection);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GtkClipboard *gtk_clipboard_get             (GdkAtom       selection);
-#endif
 
 GDK_AVAILABLE_IN_ALL
 GdkDisplay   *gtk_clipboard_get_display     (GtkClipboard *clipboard);

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 45ef7cacfe66d5d4b41c1166626788fa821a90c0..43c00eaa35698cc241666154f34bfb341e419cfb 100644 (file)
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -76,13 +76,11 @@ struct _GtkPlugClass
 GDK_AVAILABLE_IN_ALL
 GType      gtk_plug_get_type              (void) G_GNUC_CONST;
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 void       gtk_plug_construct             (GtkPlug    *plug,
                                            Window      socket_id);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_plug_new                   (Window      socket_id);
-#endif
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_plug_construct_for_display (GtkPlug    *plug,

diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index f76e8f256afefaed7d8d9c8ed5e05da87c228e68..28fad405da7be90ba7f2d2739e9e6607bd5b55de 100644 (file)
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -87,10 +87,8 @@ struct _GtkSettingsValue
 /* --- functions --- */
 GDK_AVAILABLE_IN_ALL
 GType           gtk_settings_get_type                (void) G_GNUC_CONST;
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GtkSettings*    gtk_settings_get_default             (void);
-#endif
 GDK_AVAILABLE_IN_ALL
 GtkSettings*    gtk_settings_get_for_screen          (GdkScreen *screen);